You could do a rebase interactive: git checkout new_feature git rebase –interactive old_feature and drop B1: you simply delete the line with B1: # If you remove a line here THAT COMMIT WILL BE LOST
I’m coming late to the party but I got a little scared after thinking I lost this morning’s work due to an IntelliJ Smart Checkout. So I looked to see if there was a fix and this question came up first. Sadly, my git stash list was empty (probably because I tried merging the conflicting … Read more
Nothing would happen, but your next push would be not accepted. Unless you would force push. This would not break remote repository also, so it is also not that bad. Things go bad when you have more people using this repo. Rewriting history can cause a bit of chaos for others who will pull new … Read more
Christopher is right, tagging will help you do this. I recommend deleting the branch name too to make it a little harder for someone to checkout the branch and make edits. First, merge the branch into develop git checkout develop git merge –no-ff feature_1 Then checkout the branch git checkout feature_1 Then create a tag, … Read more
To get a git history without any pull request merge commits I can use the merge button (Pull request page) and perform a rebase and merge:
One config setting that might help here is core.sharedRepository, presented in the blog post “Preserving Group Write on Git Objects in a Collaborative Repository”: The solution turned out to be fairly straightforward. In the file .git/config, I added a line that read: “sharedRepository = group“, like so: [core] repositoryformatversion = 0 filemode = true bare … Read more
This answer was mostly derived from Git Pathspecs and How to Use Them. I haven’t copied everything over, so look into the link to dig deeper The pathspec is the mechanism that git uses for limiting the scope of a git command to a subset of the repository. If you have used much git, you … Read more
Issue 33301 mentions: the only way to move a project with containers in the registry is to first delete them all. Meaning delete the container tags in the registry (not the repository or CI/CD) Navigate to sidebar menu Package->Container Registry on a project where Container registry is enabled Click on the button “Remove Tag” (since … Read more
The way git displays log messages is that it will take the 1st line and use that in git log –oneline, and then anything else is displayed when using the normal git log, as long as there’s a blank line between the first and second parts: Add summary line here An example of how to … Read more
You won’t lose commits by closing the terminal. ctrl+c will exit the prompt > What happened was you opened up a string with the odd number of ‘ characters. Bash expects more input for your string, and allows you to enter it after the > prompt. Try typing ‘ and hit return, you will get … Read more