Szymon xd

golkarolka@golkarolka-seksiak ~/Desktop/io/VisuAlgo $ git stash
foo.cc: needs merge
include/array_1d_element.h: needs merge
foo.cc: needs merge
include/array_1d_element.h: needs merge
foo.cc: unmerged (7a4bdd9cc48db47c0d4c936f59e9cb8a768763b9)
foo.cc: unmerged (8b0b6a3258e20a13889fd90b377ee203e14b75ff)
foo.cc: unmerged (f769d797e2a03940c37eb25bb0e800a14a7bb27c)
include/array_1d_element.h: unmerged (23bd1793b57405a42cf6f7098f9335efefd38a87)
include/array_1d_element.h: unmerged (7c7876f28d680a7d98a714f8954bd1f8b90de95f)
include/array_1d_element.h: unmerged (21948056b0d9f686c7ecf8bb9f4157ea96ace694)
fatal: git-write-tree: error building trees
Cannot save the current index state
golkarolka@golkarolka-seksiak ~/Desktop/io/VisuAlgo $ git pull --rebase
error: Pull is not possible because you have unmerged files.
hint: Fix them up in the work tree, and then use 'git add/rm <file>'