nav[aria-label="Primary Navigation"] { padding: 0; & ul { list-style: none; width: 100%; display: flex; flex-direction: row; justify-content: start; align-items: start; gap: 30px; padding: 0; & li { margin: 0; } & ul li { list-style: none; } } }

Should the Master be the latest version? How do I ignore uncommitted changes?

Jeff Baumgart

Hi,

It has been a while since using Sourcetree and I need to modify a program from 2 years ago. Below is how it was saved on Bitbucket. (The production program was generated from the Working copy).

I notice the Master is not at the top. Does this mean the latest was never committed/pushed up? If so, how can I correct this?

I want to modify the program using a new branch. Where do I need to branch from?

Is there a way to ignore the uncommitted changes (unnecessary compile generated files)?

Thanks,

Jeff

Accepted answers

All comments

Mikael Sandberg

Hi Jeff,

Welcome to the Atlassian Community.

You are correct, your master branch does not have the latest that is in the RA431... branch, meaning it has not been merged into your master branch.

Where you branch off from is up to you, if you need the latest code you can either do it from RA431... branch, or you can wait until it has been merged into master and then branch off of master.

Yes, your unnecessary files can be ignored by using a gitignore file. Note that the gitignore file does not affect files that are already in the repository.

Jeff Baumgart

Thank you, I didn’t realize the last branch never got merged. If I remember right, the Master needs to be checked out first before I can merge. Is that correct?

Mikael Sandberg

Correct, the target branch of the merge has to be checked out before the merge.

Jeff Baumgart

Thanks, I merged the branch OK but when I try to push it to origin I get this error: