git discussion thread

[sbillinge]

thread for getting help with git issues

[sbillinge]

@mspence2 typing this will tag you and send you an email

[sbillinge]

my username @sbillinge

[jlhitt1993]

@jlhitt1993 Jeremy

[mspence2]

@mspence2

[aplymill7]

@aplymill7 Austin

[YaoTomTong]

@YaoTomTong Yao Tong

[sbillinge]

call was dropped, but no worries, I think we got everything covered. I am excited about this project, it should be fun! post questions here when you have them. Relevant link, for the record is:
https://github.com/Billingegroup/group_git_workflow

[sunhwibang]

@sunhwibang Sunhwi

[mspence2]

I am having trouble with internet, and I keep getting booted from the call. I need to head to class anyway. When I get out of class, I will fetch and merge my master branch and reopen the the authors file to see if it is updated. I also plan to work on the use case that I created by addressing the comments you gave me. Let me know if there are any additional tasks you all discuss.

[jlhitt1993]

@sbillinge This is not considered a git issue but I think it should be okay to ask here. I'm wondering what the goal of writing a test is. Is the plan to execute something like run_tests.py after the user installs pytentiostat to make sure that all the files can be found and the necessary methods can be called on the user's system? Is there anything else a test should cover?

[sbillinge]

It is the opposite in some sense. These are called unit tests and they test that different units of the code behave the way they are supposed to. Users will never see them. They are used by developers for designing and debugging code.

…

On Thu, Sep 12, 2019 at 2:47 PM Jeremy Hitt ***@***.***> wrote: @sbillinge <https://github.com/sbillinge> This is not considered a git issue but I think it should be okay to ask here. I'm wondering what the goal of writing a test is. Is the plan to execute something like run_tests.py after the user installs pytentiostat to make sure that all the files can be found it tests and the necessary methods can be called on the user's system? Is there anything else a test should cover? — You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub <#2?email_source=notifications&email_token=ABAOWUKJYO7DP6VA2UESRW3QJKFEHA5CNFSM4GXQ3R5KYY3PNVWWK3TUL52HS4DFVREXG43VMVBW63LNMVXHJKTDN5WW2ZLOORPWSZGOD6S37PQ#issuecomment-530956222>, or mute the thread <https://github.com/notifications/unsubscribe-auth/ABAOWUPDBPUKVGMQEFC3YILQJKFEHANCNFSM4GXQ3R5A> .

[mspence2]

Cleanliness question - when a local branch is pulled into the main repo and is deleted online, how do I remove it from the branch list on my computer (when I type git branch)?
Should I use git push origin --delete ?

[jlhitt1993]

git branch -d branchname. If it says the branch has not been synced with remote but you know you want to delete it, use -D

…

On Mon, Apr 6, 2020 at 10:36 AM mspence2 ***@***.***> wrote: Cleanliness question - when a local branch is pulled into the main repo and is deleted online, how do I remove it from the branch list on my computer (when I type git branch)? Should I use git push origin --delete ? — You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub <#2 (comment)>, or unsubscribe <https://github.com/notifications/unsubscribe-auth/AJMG5VKNDJEXWGP34PXSNUTRLHSIRANCNFSM4GXQ3R5A> .

[sbillinge]

fyi, be careful with -D . When git doesn't allow you to delete a branch it is because there are unmerged changes and they will be lost if you -D, so make sure you really want to blow that thing away before you do that. Safe workflow is: ``` git checkout master git pull upstream master ``` then ``` git branch --merged # it will show branches that are fully merged and safe to delete git branch -d <branchname> ``` If you don't sync with upstream it will show a branch as unmerged because, well, it isn't fully merged! S On Mon, Apr 6, 2020 at 10:49 AM Jeremy Hitt <[email protected]> wrote:

…

git branch -d branchname. If it says the branch has not been synced with remote but you know you want to delete it, use -D On Mon, Apr 6, 2020 at 10:36 AM mspence2 ***@***.***> wrote: > Cleanliness question - when a local branch is pulled into the main repo > and is deleted online, how do I remove it from the branch list on my > computer (when I type git branch)? > Should I use git push origin --delete ? > > — > You are receiving this because you were mentioned. > Reply to this email directly, view it on GitHub > <#2 (comment)>, > or unsubscribe > < https://github.com/notifications/unsubscribe-auth/AJMG5VKNDJEXWGP34PXSNUTRLHSIRANCNFSM4GXQ3R5A > > . > — You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub <#2 (comment)>, or unsubscribe <https://github.com/notifications/unsubscribe-auth/ABAOWUL3A6SZRIQF7XKDEO3RLHTWTANCNFSM4GXQ3R5A> .

-- Professor Simon Billinge Columbia University