It's not the same without you

Join the community to find out what other Atlassian users are discussing, debating and creating.

Atlassian Community Hero Image Collage

ignore only certain changes in file

I have a few files that have paths in them that i have changed to run locally.
I don't want these local path changes to get pushed to the repo but i also do not want to ignore the file as I may change other parts and want to push those changes.

My two concerns are 1. the changes are always there in the "Unstaged files" section, which becomes annoying to constantly go through all the files to try find the real changes that i want to commit. 2. im worried i accidentally stage the whole file without removing the path change and push that change to the repo unknowingly (which brings me back to point 1 where i have to carefully check the files to avoid this)

What is the easiest and fastest way to deal with this?

I've tried using a branch but its a headache trying to push changes to the master branch.
Using a patch is slow and its annoying to constantly update the patch.
Stashing is the easiest but it means i lose the local changes while its stashed.
Ive tried to look into assume-unchanged and skip-worktree but it seems they both have issues when pulling or hard reset (https://stackoverflow.com/questions/13630849/git-difference-between-assume-unchanged-and-skip-worktree/23806990#23806990).

0 answers

Suggest an answer

Log in or Sign up to answer
TAGS
Community showcase
Published in Sourcetree

Sourcetree for Windows - CVE-2019-11582 - Remote Code Execution vulnerability

A vulnerability has been published today in regards to Sourcetree for Windows.  The goal of this article is to give you a summary of information we have gathered from Atlassian Community as a st...

4,083 views 0 11
Read article

Community Events

Connect with like-minded Atlassian users at free events near you!

Find an event

Connect with like-minded Atlassian users at free events near you!

Unfortunately there are no Community Events near you at the moment.

Host an event

You're one step closer to meeting fellow Atlassian users at your local event. Learn more about Community Events

Events near you