merge-conflict-resolution

Currently I am working in a feature branch that will soon be merged back into master. I recently tried just that and had some merge conflicts, which I had to fix manually. So, is it possible to tell git to always use the version from the merged branch in order to avoid merge conflicts beforehand? In this case I fixed the conflicts manually but always chose the version from the merged branch, so this would save me some tedious work. You can do exactly this in git with the following command, assuming that feature is the name of your feature branch: git merge -s recursive -X theirs feature This

Is there a way to avoid merge conflicts in version tag in pom.xml when merging master into a branch? I have quite a few pom files, 80, and all of them have same version which is different from one in master. It's laborious and time-consuming to execute git mergetool for 80 pom files just for a version tag. You probably have a few options. None of which are perfect :-/ 1) you can use 'git merge -s ours', but you should only do that when you know you don't need the rest of the changes too. 2) You can also use git rerere, which helps resolve conflicts by memorizing what you did last time. You can

I've created pull request I got into this: "Approve" button does nothing and complete is disabled. How do I resolve this confligt in pull request? Update Microsoft just added browser based merges. This may get you out of a pickle for small conflicts. And offers improved visualizations of the different scenarios as of Sprint 150 . For more complex situations: You have two options to resolve the conflict, reverse-integrate the changes from the target branch (which creates additional merge commits), or rebase on the target branch (which leaves your history nice and clean). Merge from target to

We are some developers who work on same project and we use git for the project. If two or more of us happen to work on same file, we receive git conflicts which are hard to deal with, sometimes changes done by one developer are lost when these conflicts happen. How do they work with git in a team? What should be the proper flow in order to avoid git conflicts ? Thanks in advance. Before you dig deep into your workflow, before you spend a moment of time or a dollar of money rebuilding your communication processes, ask your team three questions: Do we enforce whitespace conventions? If we use

I have a script running some Mercurial commands in non-interactive mode on a build server. One of the commands merges two branches and there is always a conflict in the .hgtags file during the merge because of the way the build scripts are set up. How can I force Mercurial to always merge the .hgtags file using changes from both files, first from one, then from the other? For example, if I the files to merge were A B C and A B D I would like the result to be A B C D I am guessing I will need a custom merge tool. What tool provides this functionality? Martin Geisler Please see the answer below

I've seen people recommend that all developers set up a symlink on their machine from C:\project\.git\rr-cache to a shared folder \\server\rr-cache . However, it would seem more convenient to share the folder by including it in the git repository itself, if that is possible. I've seen people mention this solution, but not actually how to do it. Any ideas? It can be shared via a dedicated branch. You want to stop if there is a conflict on that branch and resolve it as it means that there were attempts to solve the same conflict in 2 different ways. Needless to say, that will be the exception to