Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
a4802ed
Add formula
Jun 16, 2015
8b4df25
Merge pull request #1 from termvader/formula
azizhk Jun 16, 2015
7a1dbdb
line no 51 changed (original number 41)
grvdahiya Jun 16, 2015
a6f4a64
line 52 corrected
sdurgi17 Jun 16, 2015
ab6f4ee
Merge pull request #4 from srikar-durgi/master
azizhk Jun 16, 2015
2132f16
Merge remote-tracking branch 'upstream/master'
grvdahiya Jun 16, 2015
2e6a353
Trying git using git workshop
chirag-rivigo May 28, 2016
6b10fcb
full file changed
priyaranjan290 May 28, 2016
d1205e5
Deleted second last para and added some text
PankajRasgania May 28, 2016
8fa34bd
email added in the place of second last para
anshuljain226 May 28, 2016
e97d1f3
Modifed the last para of the poem to give it a different look
chirag-rivigo May 28, 2016
80b4906
Last four lines are beginning with '&' now
ankitnkumar123 May 28, 2016
5815b16
Merge pull request #1 from PankajRasgania/master
grvdahiya May 28, 2016
ff129b4
Merge branch 'master' of https://github.com/grvdahiya/git-workshop
chirag-rivigo May 28, 2016
fc58805
Merge pull request #4 from chirag-rivigo/master
grvdahiya May 28, 2016
c35d365
conflicts resolved
anshuljain226 May 28, 2016
78f7392
trying to resolve conflict
priyaranjan290 May 28, 2016
c5e0d9f
conflicts resolved
anshuljain226 May 28, 2016
4b8c806
Merge pull request #3 from anshuljain226/master
grvdahiya May 28, 2016
508d3d1
fgfdgfd
ankitnkumar123 May 28, 2016
f2e14cd
resolved merge conflicts as per PR 2114r32w
priyaranjan290 May 28, 2016
e414a22
50-50
ankitnkumar123 May 28, 2016
f97f40b
Merge pull request #5 from ankitnkumar123/master
grvdahiya May 28, 2016
b120da1
resolved merge conflicts
priyaranjan290 May 28, 2016
3291d2f
Merge pull request #2 from priyaranjan290/master
grvdahiya May 28, 2016
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,5 @@
For new hires 2015

Far over the misty mountains cold: http://lotr.wikia.com/wiki/Far_over_the_Misty_Mountains_Cold

Formula: floor((number-1)/4) + number
26 changes: 20 additions & 6 deletions far_over_the_misty_mountains_cold_buggy.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
this is added by priyaranjan

Farthe misty mountains cold
To dungeonsand caverns old
We must away ere break of day
Expand Down Expand Up @@ -48,8 +50,8 @@ Todeep and caverns dim
We must away, ere breakday,
Toour harps and gold from him!

The windon the withered heath,
butthe forest stirred no leaf:
The wind was on the withered heath,
but in the forest stirred no leaf:
there shadows lay beor day,
andthings silent crept beneath.

Expand Down Expand Up @@ -103,12 +105,24 @@ O! wandering folk, theheed!
haste! Come haste! across the waste!
The king of friend andhas need.

Now callover mountains cold,
‘Come back unto theold’!
Herethe Gates the king awaits,
His hands are rich withand gold.

\\anshul.jain@partners.rivigo.com
//This paragraph is deleted after forking by Pankaj Rasgania


Theis come unto his hall
Under the Mountainand tall.
Worm of Dread is slain and dead,
And ever so our foesfall!


And Theis come unto his hall
And Under the Mountainand tall.
And Worm of Dread is slain and dead,
And thus ever so our foesfall!


& Theis come unto his hall
& Under the Mountainand tall.
And Worm of Dread is slain and dead,
And thus ever so our foesfall!
121 changes: 121 additions & 0 deletions far_over_the_misty_mountains_cold_buggy.txt~
Original file line number Diff line number Diff line change
@@ -0,0 +1,121 @@
Farthe misty mountains cold
To dungeonsand caverns old
We must away ere break of day
To seek the pale gold.

Theof yore made mighty spells,
While hammers fell likebells
In places deep, where dark sleep,
Inhalls beneath the fells.

ancient king and elvish lord
There many a gleaminghoard
shaped and wrought, and light they caught
To hide in gems on hiltsword.

Onnecklaces they strung
The flowering , on crowns they hung
The dragon-fire, in twisted
meshed the light of moon and sun.

Farthe misty mountains cold
To dungeons deepcaverns old
We must away, ere breakday,
Toour long-forgotten gold.

Goblets they carved therethemselves
Andof gold; where no man delves
There lay they long, anda song
sung unheard by men or elves.

The pines were roaring on the ,
Thewere moaning in the night.
The fire was , it flaming spread;
The trees like torches blazedlight.

Thewere ringing in the dale
And men theyup with faces pale;
The dragon’s ire morethan fire
Laidtheir towers and houses frail.

The mountain smoked beneathmoon;
Thethey heard the tramp of doom.
They fled their hall tofall
Beneathfeet, beneath the moon.

Far over the mistygrim
Todeep and caverns dim
We must away, ere breakday,
Toour harps and gold from him!

The wind was on the withered heath,
but in the forest stirred no leaf:
there shadows lay beor day,
andthings silent crept beneath.

The wind came down fromcold,
anda tide it roared and rolled;
the branches groaned, themoaned,
andwere laid upon the mould.

The wind went on from WestEast;
movement in the forest ceased,
but shrill and harshthe marsh
itsvoices were released.

The grasses hissed, theirbent,
thewere rattling--on it went
o'er shakenunder heavens cool
where racing clouds were tornrent.

Itthe Lonely Mountain bare
and sweptthe dragon's lair:
there black and darkboulders stark
flying smoke was in the air.

It left the world and tookflight
overwide seas of the night.
The moon set sail upongale,
stars were fanned to leaping light.

Under the Mountainand tall
King has come unto his hall!
His foe is dead, theof Dread,
Andso his foes shall fall.

Theis sharp, the spear is long,
The arrow swift, theis strong;
The heartbold that looks on gold;
The dwarves no more shallwrong.

Theof yore made mighty spells,
While hammers fell likebells
Indeep, where dark things sleep,
In hollow halls beneathfells.

Onnecklaces they strung
The light of stars,crowns they hung
The dragon-fire, fromwire
melody of harps they wrung.

Thethrone once more is freed!
O! wandering folk, theheed!
haste! Come haste! across the waste!
The king of friend andhas need.


\\anshul.jain@partners.rivigo.com
//This paragraph is deleted after forking by Pankaj Rasgania


Theis come unto his hall
Under the Mountainand tall.
Worm of Dread is slain and dead,
And ever so our foesfall!

& Theis come unto his hall
& Under the Mountainand tall.
And Worm of Dread is slain and dead,
And thus ever so our foesfall!

>>>>>>> 4b8c8069ef805dfdadcd4c7997cb44c055f4d02a