#MAKE A DETACHED HEAD MASTER GIT MODS#

Checking out a branch will change the HEAD to point to the checked out branch. ' as appropriate to mark resolution)Дeleted by us: src/stokerMonitor/TODCellEditor.javaДeleted by us: src/stokerMonitor/TimeLineTableModel.javaД«oth modified: src/stokerMonitor/TimelineConfig.The Git HEAD is a Git reference object that represents the current branch. So now I am not sure what I can trust: >git status RMonitor/TODCellEditor.java left in tree. StokerMonitor/TimeLineTableModel.java left in tree.Д¬ONFLICT (modify/delete): src/stokerMonitor/TODCellEditor.java deleted in Updated upstream and modified in Stashed changes. Oddly now I can: >git statusДeleted: src/stokerMonitor/DelayButton.javaДЇinally when I tried to apply your stash suggestion I got a bit further but there should be no conflicts: >git stash apply src/stokerMonitor/TimelineConfig.javaД¬ONFLICT (content): Merge conflict in src/stokerMonitor/TimelineConfig.javaД¬ONFLICT (modify/delete): src/stokerMonitor/TimeLineTableModel.java deleted in Updated upstream and modified in Stashed changes. Your branch is up-to-date with 'origin/Timeline'.ДonвЂ™t know why that file is there but I was not able remove it. Nothing to commit, working directory clean Your branch is up-to-date with 'origin/Reporting'. I donвЂ™t know why target is untracked although that directory should be associated with just the Reporting branch, I think. Nothing added to commit but untracked files present (use 'git add' to track) Your branch is up-to-date with 'origin/master'. Here are the status outputs: >git checkout master I assumed it would be reinstated with the correct version when I checkout that branch. gitignoret saying it would be overwritten with a checkout so I removed it. Stash 1 is what I want to apply to Timeline but it obviously it is now detached: >git stash apply 6df1750ДЄre these related? How do I fix them? TIAA.

#MAKE A DETACHED HEAD MASTER GIT MODS#

>git stash WIP on master: bdfc452 Help mods & Config default WIP on (no branch): 6df1750 Timeline Table Input Verifier Complete Also, once I checkout Timeline, I want to apply the stashed code. I always have to checkout master before going to one of the other branches. However, if I am in Reporting and checkout Timeline or vise-versa I get an error: error: The following untracked working tree files would be overwritten by checkout From master I can checkout either of the other 2 branches (Reporting and Timeline) and they are up to date. I can checkout master and it is up to date. Actually 2 layers but they may be related. Thanks but now I am down to the next layer of the onion. error: Your local changes to the following files would be overwritten by checkout:

I read where I am supposed to checkout master to fix a detached head problem but that doesnвЂ™t work either. Please move or remove them before you can switch branches.

Please, commit your changes or stash them before you can switch branches.Д®rror: The following untracked working tree files would be overwritten by checkout: Src/stokerMonitor/TimeLineTableModel.java When I checkout Timeline I get this: error: Your local changes to the following files would be overwritten by checkout: These files are all associated with вЂTimelineвЂ™. No changes added to commit (use 'git add' and/or 'git commit -a')

Src/stokerMonitor/TimelineTableModel.java Src/stokerMonitor/TimeLineTableListener.java Src/stokerMonitor/TimeLineComboClass.java

Modified: src/stokerMonitor/TimelineConfig.java Modified: src/stokerMonitor/TimeLineTableModel.java Modified: src/stokerMonitor/TODCellEditor.java ' to discard changes in working directory) The current status is: HEAD detached from 8cef63c вЂTimelineвЂ™ is the branch I was working with and had locally committed and non-committed changes. I have a detached head problem I need help fixing.

Make a detached head master git