Questions tagged [automerge]
35 questions
0
votes
1 answer
Do you examine the results of non-conflicting automerges?
I was wondering, how do you treat automerges that go through without conflicts? Do you just verify via compile / unit tests and then commit, or do you take a look at each merge result to ensure that there are no other, semantic issues, that might…
Hordak
- 135
- 1
- 5
0
votes
1 answer
git pull auto-merge failed
We use a single branch for all the users. Every time a user tries to push, he needs to pull others changes first. This results in a git automerge which works fine in most of the scenarios.
Yesterday, one of our users did the above and it resulted…
Nikhil Gupta
- 1,708
- 1
- 23
- 38
0
votes
1 answer
Automatic Merge svn-git?
I have a few question.
First of all i want to know is git better than subversion?
I am using subversion i want to merge trunk to branch automatically , how can i do this? If it’s impossible do i have to use git ? Is merging automatically a good way…
mustafa
- 109
- 1
- 3
- 8
-1
votes
1 answer
svn conflict issue
I am doing a documentation for svn for my project. So I made a sample svn update.During that time I faced the below issue.
I am working on a file in my local copy. I made a single line change in the file, before committing the changes i did an…
Ashwini vijaykumar
- 13
- 2
- 8
-1
votes
2 answers
TFS auto merge picking the wrong code
We are a small team using TFS express 2012. While merging a changeset to the another branch I encountered a conflict. When I chose the merge tool to resolve the conflicts I noticed it has auto merged some of them but with the older code. what can…
sasank
- 21
- 1