Tagged Questions
6
votes
2answers
133 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:
...
1
vote
3answers
37 views
Workaround git commit
Lets say I have 3 git commits:
Commit changes on sidebar
Commit changes on footer
Commit changes on header
Now lets assume I have went trough spiritual awakening and realized that only changes I ...
0
votes
2answers
76 views
Git is duplicating code
We just switched from Subversion to Git.
The problem that came up this morning was that we cherry-picked a commit from a branch into master so maser would have a bug fix. Then we merged master back ...
7
votes
3answers
150 views
How to use the default git commit message after resolving merge conflicts?
After doing a merge and resolving conflicts, is there an "easy" way to just accept the default generated commit message from the command line? One of our developers will resolve all the conflicts, ...
0
votes
1answer
40 views
How to pick a commit in sub-branch and merge it into main branch?
So I have:
master
+commit1
+commit2
+commit3
myBranch
+commitA
+commitB
+commitC
I want to pick commitB in myBranch and merge it to master branch, what should I do?
1
vote
2answers
46 views
Merge next commit's changes to current commit
I am backtracking through my history to find what exactly broke iOS5.1 for my app. I've traced it to a single commit, however the commit has many files.
I would like to git checkout [commit before ...
0
votes
1answer
43 views
git merge without commiting local changes beforehand
Maybe this has been answered before, but I can't seem to find it.
Let me illustrate my problem. I checked out a git repository and then done some modifications to the files. This has been some time ...
2
votes
2answers
53 views
Git new file appears in all branches
I thought a file created on one branch will not appear in any other branches until I merge or rebase the branch?
Example:
I have two branches:
master
new_contact_page
I checkout the ...
2
votes
3answers
79 views
git(hub) remove commit from a merge
My question in similar to git remove commit from a merge but I can't follow instructions suggested there, since my repository's history is a little bit different.
I'm working on a open-source ...
2
votes
3answers
142 views
Mercurial workflow: why do I seem to commit everything twice?
I'm trying to grasp the Mercurial basics so please bear with me. :) My current workflow is as follows:
do some work until I'm ready to commit or need the others' changes
pull
at this point I'd like ...
0
votes
1answer
60 views
HG Test Merge then Commit
I would like to merge a feature branch with another, and test the code.
Can I do a merge, run code on the branch, then if I am satisfied, Commit ?
Will this have any negative effects ?
0
votes
1answer
343 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 ...
1
vote
2answers
66 views
Can I checkout & commit to several Mercurial hg branches at once?
I've forked a project from the internet, and I want to write some new features. I want to write several orthogonal features at the same time, (eg. debug helpers, new feature X, new feature Y), and ...
0
votes
2answers
82 views
Git - move commit within branch, then insert branches
Have looked around and can't find the answer to this! I am a complete git n00b and really grateful for anyone who can give me some pointers.
I initially had one long branch of commits in my ...
1
vote
1answer
31 views
how to merge to a local branch after checking out to a previous commit
I am working on a local branch VISS. Then I decided to check out a previous commit:
git checkout 98ea3c8042c39e
I made some important changes to the code. and then I committed again.
Now I need ...
