commit

I am aware that rollbacks can remove commits from the latest changeset in a local repository. However, is it possible to remove all the latest commits since the previous push without having to re-clone the share repository? You could make a new repo with hg clone : hg clone -r last_good_changeset localrepo newlocalrepo You can use the hg strip command, part of the mq extension: hg strip REV This will remove that revision + all its descendants. Before you try this, make a copy/clone of the repository to experiment in. If you are using mercurial eclipse, you can rollback once, then shelve those

There are minor coding style changes that I often want to commit to the source control, but now the change log is full of those changes that do not affect code functionality. What should I do next time I have to fix minor things like: Remove and sort usings (in .NET, imports in python, includes in c++) Correct indentation, spacing and line breaks If you are changing the code file, I don't really see why you wouldn't want to commit and share those changes. If you don't you run the risk that someone else will fix them and then collide with yours. If they aren't changes that other users want in

I truly believe that to have one commit on one issue is a good practice. I'm sure I read it somewhere in an article like “Best practices”. As such, my workflow has been the following: For a new issue, I create a new local branch with git checkout -b new-issue . Commit all changes into it. Sometimes this involves lots of commits. When done, I squash the commits and rebase them into current thematic branch. If something goes wrong, I can git revert the commit, find the bug, fix it, and commit new patch into the thematic branch. I won't change the remote repository’s history. But today, I was

I have a big merge going on with over 300 conflicting files. I want to resolve these using mergetool, but there's no way I'm going to finish it all in one sitting. How can I commit the merge and then come back later and continue the same merge? Normally it seems git doesn't allow you to commit if there are conflicts in the index. I'm assuming by "can't do it in one sitting" you actually mean "want to do some other things before I finish" - since you could just leave the partially resolved merge in your work tree otherwise. First, before you go to any trouble, note that you could simply create

I'd like to move my last few commits from master into a branch of their own. The tree on my PC looks like that: W (some branch) / X1--X2--X3--X4--Y--Z1--Z2 (master) I'd like it to look like: W (some branch) / X1--X2--X3--X4 (master) \ Y--Z1--Z2 (my new branch) However, the tree at GitHub looks like: W (some branch) / X1--X2--X3--X4--Y (master) That's what I saw as a solution for moving the last commits to another branch: git checkout master git branch my_new_branch git reset <commit_id> My question is: would I be able to successfully push to GitHub after moving the commits into a new branch