Tagged Questions
19
votes
15answers
37k views
How do I correct “Commit Failed. File xxx is out of date. xxx path not found.”
I have recently run into a particularly sticky issue regarding committing the result of a merge in subversion. Our Subversion server is @ 1.5.0 and my TortoiseSVN client is now @ 1.6.1.
I am trying ...
2
votes
3answers
440 views
How to I “move” my commits from “no branch” to an actual branch?
I made a mistake, and started making commits "to the last tag", which lands my commits in "no branch". They should have been applied at the head of an already existing branch. I have not pushed my ...
8
votes
2answers
2k views
Show commits in a git merge?
Say I create a hotfix branch off develop, make 2 commits and then merge this back to develop and destroy the hotfix branch. How do I find out what commits were part of the merge. Is that possible?
6
votes
2answers
142 views
What git commit practice is better?
I truly believe that to have one commit on one issue is a good practice(I'm sure I read it somewhere at article like: "Best practices") but today I was surprised.
I'm trying to work in a such way:
...
2
votes
1answer
88 views
Which SCM/VCS cope well with moving text between files?
We are having havoc with our project at work, because our VCS is doing some awful merging when we move information across files.
The scenario is thus:
You have lots of files that, say, contain ...
2
votes
2answers
261 views
Should I have to merge and commit every time I update my Mercurial branch on the production server?
I'm using Mercurial in a recent project. On the web server where I'm deploying the project I have a slightly different config file with production settings. The problem is when I pull and update, I ...
0
votes
1answer
441 views
Github workflow and pull requests showing unwanted commits
In our business we have the following setup (hugely simplified version), pretty standard:
A master branch, which updates the live environment through a hook.
A test branch, used for QA, UA, which ...
