Say Alice and I have cloned a repository and been making changes. Alice commits her changes and pushes to remote. I then fetch that change and merge it with mine. Imagine Alice, in her latest commit, has removed a class called Vehicle. I in my turn, I have added a new class called Car that extends the Vehicle class. Now, when I merge her commit into mine, there's obviously going to be a problem. Does this mean that I have to examine the code and test it before merging? (Probably yes). What is the common practice in this situation?
What happens if I merge a commit that has removed code my new feature depends on
92 Views Asked by Mikayil Abdullayev At
1
There are 1 best solutions below
Related Questions in GIT
- Push mysql database script to server using git
- Git show's file path
- Git > diffs filtered, show only certain changed classes/files
- Pushing to git repository hosted by Visual studio online without entering user name and password
- How do I create my own Git branch to work on?
- Git init --bare giving error fatal: Out of memory? mmap failed: No such device
- Sub-directory into independent repository and later merge back into main repository
- How to find the Git Revision Hash in a synced SVN repo using SubGit?
- eclipse errors when try to change to master git branch
- How to have Heroku build my development branch on a staging server?
- Is "Merged in" a commit message created by bitbucket, or git?
- Git: Multiple projects under one directory
- Permission denied hg-git
- Is it possible to clone a private git repo without adding ssh keys
- Track file in master repository which is ignored in submodule
Related Questions in MERGE
- Sub-directory into independent repository and later merge back into main repository
- R: Avoid loop or row apply function
- neo4j load csv invalid "ON MATCH"
- PIG merge two lines in the log
- In SVN, what's the different between "merge from a to b" an "merge from b to a"?
- git merge "deleted by us"
- Merge sort using CUDA: efficient implementation for small input arrays
- Merge project from other branch git
- Get a single line representation for multiple close by lines clustered together in opencv
- merge or mutate a summary (dplyr)
- How to I combine data from two XML files into the same structure?
- Merging PDF files with similar names using PDFTK and a bash script
- git has problems with squashing commits once there is "Merge branch"
- How can I combine elements at the same index from separate lists?
- Merging two sorted stacks
Related Questions in REBASE
- Git rebase original project
- Why does rebasing unset my current branch and does not complete?
- git cant resolve rebase conflicts as mergetool doesnt pop up
- How merge 2 github repository to trigger a pullrequest?
- Revert one patch of git rebase
- Quick way to combine a bunch of commits together (git)
- Error with git rebase ("could not apply...")
- Git interactive rebase (fixup) preserving original date/time stamps on combined commit
- git rebase three repositories
- How to get deleted file after rebase in git
- What happens if I merge a commit that has removed code my new feature depends on
- github show the commit in the "wrong" order
- Can I use git pull --rebase instead of "git stash git pull git stash pop"?
- Switching Git workflow from merge to rebase: how to clean up a merge commit history?
- git rebase and SHAs mentioned in log messages
Trending Questions
- UIImageView Frame Doesn't Reflect Constraints
- Is it possible to use adb commands to click on a view by finding its ID?
- How to create a new web character symbol recognizable by html/javascript?
- Why isn't my CSS3 animation smooth in Google Chrome (but very smooth on other browsers)?
- Heap Gives Page Fault
- Connect ffmpeg to Visual Studio 2008
- Both Object- and ValueAnimator jumps when Duration is set above API LvL 24
- How to avoid default initialization of objects in std::vector?
- second argument of the command line arguments in a format other than char** argv or char* argv[]
- How to improve efficiency of algorithm which generates next lexicographic permutation?
- Navigating to the another actvity app getting crash in android
- How to read the particular message format in android and store in sqlite database?
- Resetting inventory status after order is cancelled
- Efficiently compute powers of X in SSE/AVX
- Insert into an external database using ajax and php : POST 500 (Internal Server Error)
Popular Questions
- How do I undo the most recent local commits in Git?
- How can I remove a specific item from an array in JavaScript?
- How do I delete a Git branch locally and remotely?
- Find all files containing a specific text (string) on Linux?
- How do I revert a Git repository to a previous commit?
- How do I create an HTML button that acts like a link?
- How do I check out a remote Git branch?
- How do I force "git pull" to overwrite local files?
- How do I list all files of a directory?
- How to check whether a string contains a substring in JavaScript?
- How do I redirect to another webpage?
- How can I iterate over rows in a Pandas DataFrame?
- How do I convert a String to an int in Java?
- Does Python have a string 'contains' substring method?
- How do I check if a string contains a specific word?
You should examine the code after the merge. You could examine the other developer's branch before merging, but that would be less convenient.
After a merge, you should rebuild the project and rerun all tests. If a class you depend on is removed during the merge, you will get a compilation error in a compiled language. In interpreted languages hopefully you have test cases covering the affected code, so the problem will become apparent when you rerun automated tests. When you detect a problem, you can inspect what was merged, and possibly discuss with the other developers any questions you may have about the reason for the changes.
Hopefully in a team with good communication and good separation of tasks, there should be no such logical conflicts in implementation changes.