Forums
Home Product Q&A Discussion groups Articles Ask a question Search
Learning
Events
Champions

Forums

Articles
Create
cancel
Turn on suggestions
Auto-suggest helps you quickly narrow down your search results by suggesting possible matches as you type.
Showing results for 
Search instead for 
Did you mean: 
Product Q&A
See all
Community resources
Top groups
Explore all groups
Community resources
Learn
Community resources
Events
Community resources

Merge conflict from higher to lower branch is showing as Modified

naresh2389
naresh2389 May 7, 2021

HI Team,

 

When i merge feature branch to dev branch i am getting conflict(someone else pushed to dev branch so conflict) but when i checkout those component which is having conflict into feature branch from dev i am getting file as Modified.Any help?

I am in feature branch then i give i am expecting conflict but getting file as modfied.

git checkout dev -- src/classes/apex1.cls

 

 

Answer
Watch
Like Be the first to like this
295 views

0 answers

Suggest an answer

Log in or Sign up to answer
Bitbucket
Bitbucket
TAGS
AUG Leaders

Atlassian Community Events

    See all events
    Community
    Forums
    FAQs Forums guidelines
    Learning
    About learning Resources
    Events
    Champions
    Copyright © 2025 Atlassian
    Privacy Policy Notice at Collection Terms Security
    Welcome illustration

    Welcome to the new Atlassian Community

    Online forums and learning are now in one easy-to-use experience.

    By continuing, you accept the updated Community Terms of Use and acknowledge the Privacy Policy. Your public name, photo, and achievements may be publicly visible and available in search engines.