![]() Of course, your alternative is to copy-paste all your changes to the new branch. ![]() This will increase the testing scope and add so many complications. Now, to promote your changes to the production/release, it is not feasible to merge the whole daily development branch to the prod/release, because you might end up adding a lot of unnecessary changes. After completing the testing you get a go-ahead for the hotfix (Which is to raise a merge/pull request to your release branch).Once the bug is fixed, You commit it to your daily development branch and test it.You work on solving the bug, in your local Dev environment.The process to the resolution looks something like this : This kind of immediate fix is termed a hotfix or a patch. Imagine you come across a bug in the production environment and an immediate fix is required. Attaching images here for Visual Studio and Visual Studio Code to help you find such instances easily. Most of the code editors provide their own git conflict resolution tools, either through an inbuilt plugin or extensions. The git reset command is used at the time of merge conflict to reset the conflicted files to their original state git reset ![]() The git merge -abort command helps in exiting the merge process and returning to the state before the merging began git merge -abort.The git reset -mixed command is used to undo changes to the working directory and staging area git reset -mixed.The git checkout command is used to undo the changes made to the file, or for changing branches git checkout.The git diff command helps to identify the differences between the states' repositories or files git diff. ![]()
0 Comments
Leave a Reply. |
AuthorWrite something about yourself. No need to be fancy, just an overview. ArchivesCategories |