2023-07-01

Question I am having some difficulty understanding how to use tags versus branches in git. I just moved the current version of our code from cvs to git, and now I'm going to be working on a subset of that code for a particular feature. A few other developers will be working on this as well, but not all developers in our group are going to care about this feature. Should I be creating a branch or a tag?…

#git

2023-06-30

Question I see something strange like: http://github.com/zoul/Finch.git Now I'm not that CVS, SVN, etc. dude. When I open that in the browser it tells me that I did something wrong. So I bet I need some hacker-style tool? Some client? (I mean... why not just provide a ZIP file? Isn't the world complex enough?) Answer What happens when the repository owner has not prepared a zip file, and you just want a download to use yourself?…

#git

2023-06-29

Question How do I force an overwrite of local files on a git pull? My local repository contains a file of the same filename as on the server. error: Untracked working tree file 'example.txt' would be overwritten by merge Answer ⚠ Warning: Any uncommitted local change to tracked files will be lost, even if staged. But any local file that's not tracked by Git will not be affected. First, update all origin/<branch> refs to latest:…

#git

2023-06-28

Question Say I have uncommitted changes in my working directory. How can I make a patch from those without having to create a commit? Answer If you haven't yet commited the changes, then: git diff > mypatch.patch But sometimes it happens that part of the stuff you're doing are new files that are untracked and won't be in your git diff output. So, one way to do a patch is to stage everything for a new commit (git add each file, or just git add .…

#git

2023-06-28

Question Suppose I have a df which has columns of 'ID', 'col_1', 'col_2'. And I define a function : f = lambda x, y : my_function_expression. Now I want to apply the f to df's two columns 'col_1', 'col_2' to element-wise calculate a new column 'col_3' , somewhat like : df['col_3'] = df[['col_1','col_2']].apply(f) # Pandas gives : TypeError: ('<lambda>() takes exactly 2 arguments (1 given)' How to do ? ** Add detail sample as below ***…

#python

2023-06-28

Question How to convert an index of a dataframe into a column? For example: gi ptt_loc 0 384444683 593 1 384444684 594 2 384444686 596 to index1 gi ptt_loc 0 0 384444683 593 1 1 384444684 594 2 2 384444686 596 Answer either: df['index1'] = df.index or .reset_index: df = df.reset_index() If you have a multi-index frame with 3 levels of index, like: >>> df val tick tag obs 2016-02-26 C 2 0.…

#python

2023-06-27

Question I tried to run brew update and I get an error about my local changes would be lost if I merged. I tried committing my local changes (don't remember making any, but it's been awhile), and that made things worse. Here's the output: MBP:Library User$ sudo brew update error: The following untracked working tree files would be overwritten by merge: Library/Aliases/fastcgi Library/Aliases/htop Library/Aliases/nodejs Library/Aliases/ocio Library/Aliases/oiio Library/Aliases/pgrep Library/Aliases/pkill Library/Contributions/cmds/brew-beer.rb Library/Contributions/cmds/brew-dirty.rb Library/Contributions/cmds/brew-graph Library/Contributions/cmds/brew-grep Library/Contributions/cmds/brew-leaves.…

#git