egulatee
egulatee
Hi @AndreasAugustin Unfortunately not, I'm not looking to ignore files. I've used [three way merges](https://blog.git-init.com/the-magic-of-3-way-merge/) in the past. I really don't know if you can identify the common ancestor between....
Yes, if someone makes changes to the same lines on both the template project and child project, there would be a conflict and the user would need to pick which...
Git performs a three-way merge automatically when you use the git merge command and a fast-forward merge is not possible. Here's how it works: Basic Merge Command: ``` git checkout...
Given that there are two repositories. I'm not sure if there's a way to do a three way merge that way. Not sure if there's some way to identify which...
I've seen merge conflicts as having both changes in the file and the end user needs to manually edit/intervene. Not sure if that works with the automation. Perhaps a "setting"...